changed name, added a couple tests