Test fixes

Minor test improvements