resolves #9 and cleaned up some tests not used.