Reintroduced several unit tests