Changed tests for single run