removed unnecessary test files and moved setUp test to non-base

class