adding tests for a lot of new stuff