[master] WIP - tests