More tweaks for karma test running.