Add Vector and Eagle
Refactor tests
Add catapult attack, v1.6