changed to use if(self) pattern
Added xct asser snippets