Some updates to get the first test going