Added Testing Functionality and Comments