Cleaned up code; added Etherpad tests back in temporarily