Updating tests. Still uncomplete/