Merged tests made by Tim and added span tags to words