almost got tests working