remove old tests, update new ones

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
0.017_2