Fixes

Fix all the unit tests