Methods renamed. Implemented functional tests to simulate data validation.