Split input logic tests to make creating new tests easier

This will allow easier reuse of the complicated set up code
and the various helper methods.

Change-Id: I864eb0da476cbf0fe087ddb1713af80d3c3eb850