Cleaned and added test function calls