Continued adding unit and integration tests