reorganised tests and added performance tests