Workign toward reenabling API paths
Moved to more generic tests
Minor formattign tweaks