Minor updates - UI
New test of Core Data