Working on some tests here