behave: fixed first test and reorganized structure