Unit test aliases cleaned up, service workers added