Made actual and mock act alike, fixed bugs