start overhaul of unit tests, remove analysis test, plug in expectations lib