WIP: added test cases