Fixed all unit tests