Unit test additions