Add working rostest, fixes from pepify.