Add testing libs and some changes in code (WIP)