Fixed compile errors w/ 2 unit tests