Refactor and speed up specs
Minor refactoring on Tedious adapter