Added unit testing of 2nd and 3rd level endpoints