moved and fixed tests