Removed unused vars.
New package for tests.
Removed tab.