Development updates for 1.2.2

- better standalone tags cleanup
- updated tests