Tests and string formatting added