Some compilation fixes
Update test code