Reorganizing tests; adding REST tests