Changed printing and added test cases