Restructure the tests / test input a bit.