fix broken tests / changes for minification optimization