Uploading some more tests and changes to tests