Removed spec tests
Merge branch 'Justin' into development