Recent updates, finally running tests correctly