Change constructors and add more tests accordingly
Follow the google styleguide: Explitcit constructor only with one argument