Fixed tests. Test status: 31/6/0