Start implementing tests; Rename presenter file