Restructooring; Added constructor test