Cleaned up placeholders
Completed 'Avoid method variables in tests'
Provide local builder methods
Use assertion libraries