Merge wangi branch with master

Adds tile engine test