General and performance tests are separated + added new interface function