Merge "Add JUnit testing for FWaasHandler class."