added more tests for other issues