Added all files required for tests to pass