more test changes, small modifications to facilitate dependency injection, server changes