Updated test and file names. Tweaked execution a bit.