small refactoring
Change to spec. Slower but more options for testing