Added more tests. Removed debug statement.