prepare for unit tests
added missing dependency — there are others I think
some more preparations for unit tests
added some more stuff to ignore