fixed test suite, still getting test error, but it can run

Removed class declarations from .cpp, moved to the .h, linked HPMODEL to test/CMakeList.txt

All declarations are now in .h, implementations are in .cpp