returning false instead of throwing exception
fixing tests