master
testing: Port integration tests to new templates structure
Fix some recently introduced Position issues