#17 Fixing tests