updated: assertion testing + new features