Added first sets of tests