Adds scenarios text file and improves tests