added tags, refactored test