cleaned up api and added multiple worker tests