Started to make progress on tests