system test with additions by timelyportfolio