Updated tests and syntax

Updated Mockito and Powermock functionality
Updated syntax on classes
Re-position helper methods