Simplify trace function
Include files necessary for testing
Bump version