Started on some tests!