Tests and Code Cleanup
* Removed view files since they were unused
* Added tests
* Adjusted code to use independent functions and variables rather than class variables and methods