Removed default tests, started fleshing out models and services