wip - merge test together
[tests] refactored to use proper placed annotation