Modularized API tests into specific files
Cleaned up old test logic