Removed some tests and moved to unit tests

Testing moved to package levels