cleanup of tests, improve test names now that responsabilities are better separated