fixed testing bugs spotted by daniel and ola