get tests passing again, some cleanup