Just added more tests