Fixed execution errors. Unit tests need to be deeper