updated solution validation and fixed broken tests