moved and added a few tests