Fix some parameter/method names, write a simple test