Updated with additional test functions
figures