Relocated remaining tests
Fixed billing tests and adjusted headers
Merge pull request #3 from inspiran/master

Relocated tests