Improvements for tests