#ngp-16 Fixed
#ngp-13 Fixed

And added a whole load of tests.