Cleaned up App and added very basic unit tests