Corrected bugs in the test suite
Wrote some simple performance tests