Fixed imports to not use wildcards and fixed a failing test