revamp test structure to incl features/
toward #47, but testing needs to be a little more thorough;