acu111809 - Remove unwanted helper methods
acu111809 - More spec tests