Adressing #1 and #6
Resolving test imports