Parameterize solutions to simplify testing