Added default tests, and range tests, cleaned up spec