fixes
fixing tests