Combine css files for app with import, fix so tests work