* fixing tests