Adding performance tests and slight restructure of tests