Updating wrapper and some front-end tests to evaluate perf