Fixing up naming
Clean up testing