Simplified tests and squashed corener case. :+1: