refactor tests, no passing