Added tests and pared down fetching methods.