Restructure tests, add position assertions