Adding test cases, dirty commit