[WIP] Test and Fix bugs from Cycle 1