tests and other misc tasks

This commit was sponsored by pebble {code}
http://pebblecode.com