fixes warnings relating to window positioning and method visibility in tests
fixes some memory management issues
resolves merge confict