fixing unit tests and some missed include_paths