added some new procs, updated tests