Unit tests draft implementation