!fixup Fixed broken tests and review findings