Changed test naming + fixed null error