Added first round of tests