FIxing unit tests