new test file and small random fixes