changed volume in order from double to int, restructured tests