New unit tests structure

Unit tests