Fix tests
Added tests for posterity