WIP - finishing tests