added and restructured tests