Changed test username to charles
Added a dummy unused method
Merged from master