Fix memory leak
Update test view controller to demonstrate the new API usage
Remove trailing whitespaces