[KFSQA-551] Fixed tags to bring this branch in-line with current standards.
[KFSQA-551] More progress!
[KFSQA-551] Just keep working, just keep working...