Fixed tests and made them py.test compatible
Fixed issue with lines that are blank after the marker
Added buildscript