Added basic test(s)