Restructured and ensured that tests works when installed