Complete 1.5.1 ,1.5.2, 1.5.3, 1.5.4 Partial 1.5.5

1.5.1 -> 1.5.4 already completed
1.5.5 reading up in files but not actually in test yet