Add Seat logic
Fix tests
Add custom testcase