Slight optimizations
Adding failing test