Added tests; Removed debug printfs