Remove watchr file
Change test directory structure
Change test method style
Clean up tests a little, turn on signup