Added guava-testlib dependency.
Added version column to supplier table.
Re-factoring.
Updated WIP.