Garbage removed, test added