Configuring tests, laying out a few more files