Small improvements and updated TestCases