Little refactoring changes and addition of test eap file.