Added benchmark test and fixed a couple unit tests