tidying up a bit
fixing the test scripts... I need to restructure
committing scrappy bits and pieces