all tests previously stated to be working are now working with 'next' declarations, other various tweaks