Cleaned up tests. Model in own file