Testing updates

* Improved test categorization
* Fix spelling of test method names