Additional tests for troubleshooting buggy place function.
Correction of place function.
Significant refactoring to eliminate duplication.