[WIP] Added some tests to establish baseline