renamed frontend server stuff, added in tests