Last test set up and working

From now on, only adding more asserts