Modification for tests