Separated attributes into different files, ran kitchen tests