Removed unused testfiles and fixed test
fixade merge conflikt