Testing

added tests \o/
fixed bugs \o/
added features \o/