Updated and fixed tests