Added some additional tests and goal expressions