Reworked simple tests to reflect simplified API.
Nesting is much simpler with the new API.
Make jshint happy.