Adding tests
removing comments