added some tests
towards templated version