Created a class for remarks and changed test cases accordingly