Added more tests and functionality for placing