FLUID-5026: Fixed a few of the broken tests
FLUID-5026: Finished implementation of proper outputs. Test are passing.. JSLinting and general cleanup still pending