Latest WIP - some tests added