added more models and tests, cleaned up old files