Adding complete suite of tests