Add tester and solver code