selfTest Fixes