Added more unit testing for APSUserId as well as added comments