Jasmine reorg

Reorganized the Jasmine test suite so it is more maintainable.