Unit test improvements, simplifications and a couple additional tests