Added benchmark test
minor fixups