#275 re-aligned tests
#118 benchmarking related