Fixing codes for tests