Finish up tests and new minification strategy