Working tests
Tests now pass