Added test, fixed so the dmbs can't move past calls/returns