Various additions/fixes to test requirements