readied tests
minor changes - trying to reincorporate tests