Test fixes

reducing warnings and errors