cleaned up scripts, brought more organization to tests