added and refactored tests, cleaned up website app