Test system dependency fix