Removed not neccessary use statements
Added missing jar files for tests
Minor fixes