Add unit and integration tests, extravaganca