Added test suite. Updated all test files other than companytest