Fixup and rename some stuff
Base tests