Added tests that pass