Fixed minification and tests