[#31] small refactoring of every test and added fixtures