totally cleaned up unit tests, no more undefineds