updated tests and fixed some bugs
finished updating tests and fixed bugs