Give tests more room
Resolve more deprecation warnings
Optimize some more