Cleaned up settings, added top-level tests directory