Pollishing a few things for the self tests