Added tests for utils. Simplified TAP call.