added some silly tests
some infrastructure changes