Added missing files and test