Work intensively on tests to make them cleaner and more stable