Added new tests, removed old commented tests