Adding more tests and perf tests