Modified solve to return one solution and cleaned up core and core_test files