Progress check-in
Fixing tests