Add some tests - WIP