consolidated FOV, added demos and tests