finished adding tests & debugging for ms 4