final changes to avoid test-case plagarism