Fix how things are assigned, last test now works