Fixed changes for tests