Finished cleaning unit tests in Portal, now fixing the remainders to do