Changes for initial push with tests