Minor functionality and test updates