[Tests] Extended structure for testing; WIP!