Improvements to karma setup