Did more work on testing functions