Removed premature test optimization