more tests and recoffeeify accordingly