Fixing tests and getSync