add new corener case + speedup tests