* fixed for unit tests