Romved excess test code