LYAP: Fixed the tests and corrected calls.