Finished testing and fixing