Made tests package a subpackage of the main package