capability checks added
alterations to the unit tests