Adding initial work for tests