Modernize tests etc.