Test fix, minor layout and gitignore updates