Tests now passing