Changes to start getting tests working.