Refs #4311 - fixes and additional tests