added simple view tests, refactored model tests