[fix] Adjusted new tests to reflect new package structure