test fixage and cleanup for @mattbasta