And added more tests