Modified Version of Tests