rename and organize methods

Signed-off-by: Andre Dublin <81dublin@gmail.com>
proper use of fakefs, back to failing test

Signed-off-by: Andre Dublin <81dublin@gmail.com>