Update/tests

@ianstormtaylor
why create this first? we should probably comment or remove if not needed