Added new tests. Removed old stuff