Improved overall testing layout, will start adding real tests