Modified test to be more comprehensive
stuff