Completed and fixed tests