Added files and logic tests