Final Working version of tests