Fixed all unit tests!