fixed misc. unit tests