Add test_name_generated_correctly() and fixing tests