Attempt At fixing bugs revealed in Demo

Also cleaned up User side test to work with changes done in this last phase