use more modern style unit tests