#23 more testing cleanups