added solution tests
fixed stuff