Added test scenarios and fixed new compile issues.