Removed debug statements + fixed 2 unit tests