Cleaning up tests
Commenting out unfinished model code