More changes for unit testing
More unit testing
Strip out uglify for now