New tests failing
Comments addressed, new tests passing