Changed constructor to private and fixed tests