Working on tests to ensure they pass