awf299 - Updated unit tests