refactor tests and make them run faster