Fixed #5 failing tests