karma: merged in tests branch