uncommented window functions in test, cleaned up normalization a bit