Project and assertion tweaks to pass tests