* fixing unit tests