Renovated tests, fixed function calls