fix Tests building
add Aaron changes and create a test for it