Added some unit tests
Removed old test include
Removed the old unit tests