Tests now working