Tidying up, ignore, move a test file to tests dir