Added "options" parameter
Tests pass significantly faster
Curly braces is required
Tests pass significantly faster (reverted from commit 2966b2272144635d612b86795c6fd2b09bff0108)