Adding more tests -- some are commented

- Commented tests are not passing yet