Update/tests

@ianstormtaylor
dont think this logic will work, same as previous one