#222 fixing tests