Started implementation of testing logic