minor changes to unit tests; pretty incomplete still; some failing