todo: adding some tests