Add test cases

WIP