Filled in these TODO unit tests