Fix container and mappers, start creating tests