bug fixes. changed last test