Improves designation logic
Add basement test