Updated with tests file