WIP - Added some tests