all tests all running properly

Minnor fixes to get tests back running. Also fixed naming issues