Added tests and test fixtures