integrated issues into unit tests and addressed #169