Some cleanup and starting some specs for problematic areas